Adwaita: Fix padding/rounding on submenus

- Apply menubar submenu style for .csd submenus;
- Remove child subemenu style (looks like it is inherited
  from a parent).

Closes https://gitlab.gnome.org/GNOME/gtk/issues/1976

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 80115f4cdf9521df1ca781e2311b982537fd9b36..a6a78f9fb2929ceda9b841d3f241e1476afdf504 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2019,11 +2019,9 @@ menubar,
 
     // remove padding and rounding from menubar submenus
     menu {
-      border-radius: 0;
-      padding:0;
-      menu {
+      .csd &, & {
         border-radius: 0;
-        padding:0;
+        padding: 0;
       }
     }
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 5cf5801977d2b62a93860b349072153a01381743..2fd48b6d705813a29ebeb40c371ee400f8e01c98 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -814,9 +814,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #353535; }
 
 menubar > box > menuitem, .menubar > box > menuitem { min-height: 16px; padding: 4px 8px; }
 
-menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; }
-
-menubar > box > menuitem menu menu, .menubar > box > menuitem menu menu { border-radius: 0; padding: 0; }
+.csd menubar > box > menuitem menu, menubar > box > menuitem menu, .csd .menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; }
 
 menubar > box > menuitem:hover, .menubar > box > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; }
 

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a1f50f8a363e26d674ecf9e737faaf4fb783f2bb..5e0fc9dee9bc6eab5d3a6444f7f2316bce7006e4 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -822,9 +822,7 @@ menubar:backdrop, .menubar:backdrop { background-color: #f6f5f4; }
 
 menubar > box > menuitem, .menubar > box > menuitem { min-height: 16px; padding: 4px 8px; }
 
-menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; }
-
-menubar > box > menuitem menu menu, .menubar > box > menuitem menu menu { border-radius: 0; padding: 0; }
+.csd menubar > box > menuitem menu, menubar > box > menuitem menu, .csd .menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; }
 
 menubar > box > menuitem:hover, .menubar > box > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; }